Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 27 Jun 2010 22:48:36 +0000 (22:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 27 Jun 2010 22:48:36 +0000 (22:48 +0000)
commitc9db36a482f30339d07cdf3ba6cfe120e3cfb51c
tree58f0783a7f92b05639b8054a91bbc1ec1e8f3447
parente4edbaa7d75479d72f6b3336e9054aaa3c4733c3
parent985b19197255e458ffadd49a19f32e1b6a779b03
Merge from mainline.